Follow up r108248, r108141: use wfUnpack() so we don't duplicate logic. Could also...